support for snapshot 24w04a (1.20.5) #3602

Outfluencer · 2024-01-20T01:42:44Z

related to #3601
if you spot bugs please report

Outfluencer · 2024-01-20T01:59:28Z

thoughts: maybe add transfer api and cookie api, also maybe provide config options to decline transfers

Outfluencer · 2024-01-20T12:00:43Z

Notice: if you want to test with an vanilla server (i think there are no spigot snapshot build) you need to change the uniqueId in
handle(final EncryptionResponse encryptResponse)
to the offline uuid

Callback<String> handler = new Callback<String>()
{
    @Override
    public void done(String result, Throwable error)
    {
        if ( error == null )
        {
            LoginResult obj = BungeeCord.getInstance().gson.fromJson( result, LoginResult.class );
            if ( obj != null && obj.getId() != null )
            {
                loginProfile = obj;
                name = obj.getName();
                uniqueId = Util.getUUID( obj.getId() );
                // here is the change
                if ( VANILLA_TESTING )
                {
                    // otherwise we get kicked for invalid signature on vanilla
                    uniqueId = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getLoginRequest().getData() ).getBytes() );
                }
                finish();
                return;
            }
            disconnect( bungee.getTranslation( "offline_mode_player" ) );
        } else
        {
            disconnect( bungee.getTranslation( "mojang_fail" ) );
            bungee.getLogger().log( Level.SEVERE, "Error authenticating " + getName() + " with minecraft.net", error );
        }
    }
};

Outfluencer · 2024-01-20T16:01:31Z

@md-5 i thought about the transfer api, should we store a cookie inside the client like "bungeecord:transfer" with a json as data like the BungeeCord version and build number and a timestamp, before we sent the transfer packet to the player?

Whats your opinion on this one?
Do you have any idea for Cookie standard format, that may also be used in spigot

OpticFusion1 · 2024-01-20T16:27:00Z

@md-5 i thought about the transfer api, should we store a cookie inside the client like "bungeecord:transfer" with a json as data like the BungeeCord version and build number and a timestamp, before we sent the transfer packet to the player?

Whats your opinion on this one?

I personally see no reason for this.

NEZNAMY · 2024-01-20T19:41:04Z

Using sendPacket may cause the packet to be sent during wrong phase (such as configuration).

Outfluencer · 2024-01-20T19:51:58Z

Using sendPacket may cause the packet to be sent during wrong phase (such as configuration).

what exactly do you mean?

Outfluencer · 2024-01-20T19:53:46Z

the cookie packets are present in game login and config phase and the transfer packet witch api is only after login state is registered for configuration and game phase, its not possible that the packet is in the wrong phase as its registered for all phases that can occour

md-5 · 2024-01-22T09:34:57Z

Notice: if you want to test with an vanilla server (i think there are no spigot snapshot build) you need to change the uniqueId in handle(final EncryptionResponse encryptResponse) to the offline uuid

Callback<String> handler = new Callback<String>()
{
    @Override
    public void done(String result, Throwable error)
    {
        if ( error == null )
        {
            LoginResult obj = BungeeCord.getInstance().gson.fromJson( result, LoginResult.class );
            if ( obj != null && obj.getId() != null )
            {
                loginProfile = obj;
                name = obj.getName();
                uniqueId = Util.getUUID( obj.getId() );
                // here is the change
                if ( VANILLA_TESTING )
                {
                    // otherwise we get kicked for invalid signature on vanilla
                    uniqueId = UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + getLoginRequest().getData() ).getBytes() );
                }
                finish();
                return;
            }
            disconnect( bungee.getTranslation( "offline_mode_player" ) );
        } else
        {
            disconnect( bungee.getTranslation( "mojang_fail" ) );
            bungee.getLogger().log( Level.SEVERE, "Error authenticating " + getName() + " with minecraft.net", error );
        }
    }
};

I guess this only applies if bungee is online mode? Should probably look into this and if it can be supported without an option as Bungee should support vanilla.

md-5 · 2024-01-22T09:35:20Z

@md-5 i thought about the transfer api, should we store a cookie inside the client like "bungeecord:transfer" with a json as data like the BungeeCord version and build number and a timestamp, before we sent the transfer packet to the player?

Whats your opinion on this one? Do you have any idea for Cookie standard format, that may also be used in spigot

I don't think that's necessary, but there should be an API

Outfluencer · 2024-01-22T11:45:58Z

Notice: if you want to test with an vanilla server (i think there are no spigot snapshot build) you need to change the uniqueId in handle(final EncryptionResponse encryptResponse) to the offline uuid

I guess this only applies if bungee is online mode? Should probably look into this and if it can be supported without an option as Bungee should support vanilla.

Yes only for online mode, for offline mode it works fine as the uuids are the same, in online mode i think some signatures are broken in some packets because of the uuid difference

…only is useable in Config and Game state

Outfluencer · 2024-01-22T22:05:59Z

@md-5 you can achieve vanilla compatibility by dropping the Chat Session packet if enforce secure profile is set to false in bungee, if you do, you also can send messages to the server, but when the message is sent from the server to all clients they will show this:

md-5 · 2024-01-22T23:42:36Z

@md-5 you can achieve vanilla compatibility by dropping the Chat Session packet if enforce secure profile is set to false in bungee, if you do, you also can send messages to the server, but when the message is sent from the server to all clients they will show this:

If we do the fix you initially mentioned does the chat error show?

Outfluencer · 2024-01-23T07:49:35Z

@md-5 you can achieve vanilla compatibility by dropping the Chat Session packet if enforce secure profile is set to false in bungee, if you do, you also can send messages to the server, but when the message is sent from the server to all clients they will show this:

If we do the fix you initially mentioned does the chat error show?

as i remember it does not show

md-5 · 2024-01-23T10:13:01Z

@md-5 you can achieve vanilla compatibility by dropping the Chat Session packet if enforce secure profile is set to false in bungee, if you do, you also can send messages to the server, but when the message is sent from the server to all clients they will show this:

If we do the fix you initially mentioned does the chat error show?

as i remember it does not show

Can you please check? And then perhaps make a separate PR but replace VANILLA_TESTING with (onlineMode && !ipForward)?

Outfluencer · 2024-01-23T10:23:56Z

Okay i can do it when i am home in like 2 hours

md-5 · 2024-01-23T10:35:16Z

No rush

Outfluencer · 2024-01-23T10:40:20Z

nah i forget i got my laptop on me, i tested, its working

md-5 · 2024-01-24T20:06:51Z

Based on an initial review, looks good to me. Well done!

Outfluencer · 2024-01-25T07:49:24Z

What do you guys think about adding an Player Transfer Event, so we can cancel transfers by the backend server?

md-5

Thanks, looks really good. Some minor comments.

api/src/main/java/net/md_5/bungee/api/connection/PendingConnection.java

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

protocol/src/main/java/net/md_5/bungee/protocol/packet/CookieResponse.java

protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java

proxy/src/main/java/net/md_5/bungee/conf/Configuration.java

md-5 · 2024-01-29T09:35:55Z

proxy/src/main/java/net/md_5/bungee/UserConnection.java

+    @Override
+    public void storeCookie(String cookie, byte[] data)
+    {
+        Preconditions.checkState( getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_5, "Cookies are only supported in 1.20.5 and above" );


Something to discuss - whether we should force a namespace

for storeCookie, we don't need to as the client creates a "minecraft:" namespace if no namespace is sent, thats why i added "minecraft:" as default namespace for retrieveCookie so we can run code like this without any issues, because for the CookieRequest it doesn't do that

player.storeCookie("test", "Outfluencer".getBytes()); player.retrieveCookie("test").thenAccept((data) -> { player.sendMessage(new String(data)); });

Yep, I know. But maybe for good API we want to force a namespace

md-5 · 2024-01-29T20:26:10Z

Thanks!

FYI I made some minor changes to the cookie handling in InitialHandler to make it properly thread safe given it's a future and may commonly be used async. Please let me know if any concerns.

md-5 · 2024-02-02T22:30:48Z

Should we add an isTransferred to PendingConnection ?

Outfluencer added 3 commits January 20, 2024 02:40

support for snapshot 24w03a (1.20.5)

ec7e867

packet ids are hex

d4c583b

remove weird empty lines

5a17c11

Outfluencer mentioned this pull request Jan 20, 2024

support for snapshot 24w03a (1.20.5) #3601

Closed

Outfluencer changed the title ~~support for snapshot 24w03a (1.20.5)~~ support for snapshot 24w03b (1.20.5) Jan 20, 2024

Outfluencer added 4 commits January 20, 2024 14:13

added CookieRequest and CookieResponse

f984c90

add option to disable transfers

0e51f06

added cookie store and retrieve API

cc979ab

remove @APinote

0f81a99

added transfer api

5778b29

wrong protocol mapping for EntityStatus fixed

fb1563b

move store cookie api out off InitialHandler to UserConnection as it …

3827d27

…only is useable in Config and Game state

add retrieveCookie to API of PendingConnection for use in early events

93cccf6

24w04a

8a2a059

Outfluencer changed the title ~~support for snapshot 24w03b (1.20.5)~~ support for snapshot 24w04a (1.20.5) Jan 24, 2024

md-5 self-assigned this Jan 29, 2024

md-5 reviewed Jan 29, 2024

View reviewed changes

Outfluencer and others added 3 commits January 29, 2024 12:36

Merge branch 'SpigotMC:master' into 24w03a

3082c69

improvements

4d7451f

removed newline

c2d6865

md-5 approved these changes Jan 29, 2024

View reviewed changes

md-5 closed this Jan 29, 2024

md-5 pushed a commit that referenced this pull request Jan 29, 2024

#3602: Minecraft 24w04a support

02c5c1e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support for snapshot 24w04a (1.20.5) #3602

support for snapshot 24w04a (1.20.5) #3602

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

OpticFusion1 commented Jan 20, 2024

NEZNAMY commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024

Outfluencer commented Jan 20, 2024 •

edited

Loading

md-5 commented Jan 22, 2024

md-5 commented Jan 22, 2024

Outfluencer commented Jan 22, 2024 •

edited

Loading

Outfluencer commented Jan 22, 2024

md-5 commented Jan 22, 2024

Outfluencer commented Jan 23, 2024 •

edited

Loading

md-5 commented Jan 23, 2024

Outfluencer commented Jan 23, 2024

md-5 commented Jan 23, 2024

Outfluencer commented Jan 23, 2024 •

edited

Loading

md-5 commented Jan 24, 2024

Outfluencer commented Jan 25, 2024

md-5 left a comment

md-5 Jan 29, 2024

Outfluencer Jan 29, 2024 •

edited

Loading

md-5 Jan 29, 2024

md-5 commented Jan 29, 2024

md-5 commented Feb 2, 2024

support for snapshot 24w04a (1.20.5) #3602

support for snapshot 24w04a (1.20.5) #3602

Conversation

Outfluencer commented Jan 20, 2024 • edited Loading

Outfluencer commented Jan 20, 2024 • edited Loading

Outfluencer commented Jan 20, 2024 • edited Loading

Outfluencer commented Jan 20, 2024 • edited Loading

OpticFusion1 commented Jan 20, 2024

NEZNAMY commented Jan 20, 2024 • edited Loading

Outfluencer commented Jan 20, 2024

Outfluencer commented Jan 20, 2024 • edited Loading

md-5 commented Jan 22, 2024

md-5 commented Jan 22, 2024

Outfluencer commented Jan 22, 2024 • edited Loading

Outfluencer commented Jan 22, 2024

md-5 commented Jan 22, 2024

Outfluencer commented Jan 23, 2024 • edited Loading

md-5 commented Jan 23, 2024

Outfluencer commented Jan 23, 2024

md-5 commented Jan 23, 2024

Outfluencer commented Jan 23, 2024 • edited Loading

md-5 commented Jan 24, 2024

Outfluencer commented Jan 25, 2024

md-5 left a comment

Choose a reason for hiding this comment

md-5 Jan 29, 2024

Choose a reason for hiding this comment

Outfluencer Jan 29, 2024 • edited Loading

Choose a reason for hiding this comment

md-5 Jan 29, 2024

Choose a reason for hiding this comment

md-5 commented Jan 29, 2024

md-5 commented Feb 2, 2024

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

NEZNAMY commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 20, 2024 •

edited

Loading

Outfluencer commented Jan 22, 2024 •

edited

Loading

Outfluencer commented Jan 23, 2024 •

edited

Loading

Outfluencer commented Jan 23, 2024 •

edited

Loading

Outfluencer Jan 29, 2024 •

edited

Loading